From e9e375638230eee16e6e1afd284dec27ec713ca3 Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Tue, 15 Mar 2005 19:36:34 +0000
Subject: [PATCH] bitkeeper revision 1.1236.34.8
 (42373942-BgO6YSNJMW5PAsR4tv0aA)

A few PPC cleanups.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
---
 xen/include/xen/irq_cpustat.h | 4 ----
 xen/include/xen/sched.h       | 1 +
 xen/include/xen/softirq.h     | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/xen/include/xen/irq_cpustat.h b/xen/include/xen/irq_cpustat.h
index 9d09ad3fb8..6465c8a0fe 100644
--- a/xen/include/xen/irq_cpustat.h
+++ b/xen/include/xen/irq_cpustat.h
@@ -20,11 +20,7 @@
 
 extern irq_cpustat_t irq_stat[];
 
-#ifdef CONFIG_SMP
 #define __IRQ_STAT(cpu, member)	(irq_stat[cpu].member)
-#else
-#define __IRQ_STAT(cpu, member)	((void)(cpu), irq_stat[0].member)
-#endif	
 
   /* arch independent irq_stat fields */
 #define softirq_pending(cpu)	__IRQ_STAT((cpu), __softirq_pending)
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 9a8746dcfd..e240ea6f31 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -22,6 +22,7 @@
 #include <xen/grant_table.h>
 #include <asm/hardirq.h>
 #include <asm/domain.h>
+#include <asm/bitops.h>
 
 extern unsigned long volatile jiffies;
 extern rwlock_t domlist_lock;
diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h
index 6180dae775..06420a6f84 100644
--- a/xen/include/xen/softirq.h
+++ b/xen/include/xen/softirq.h
@@ -14,6 +14,7 @@
 #include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/smp.h>
+#include <xen/irq_cpustat.h>
 #include <asm/bitops.h>
 #include <asm/hardirq.h>
 
-- 
2.30.2